bitkeeper revision 1.1389.1.26 (42764ebcQUGB5SU0NuOL0gHMTOa--A)

Fix int3 handling in cdb. They're harmless.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h
index 877aa3b5e8b3f941ca71fdb3179aa56a04e28359..5b7af3badc379487417d309349b982b3621d5c89 100644 (file)
--- a/xen/include/asm-x86/debugger.h
+++ b/xen/include/asm-x86/debugger.h
@@ -42,7 +42,14 @@
 
 extern int __trap_to_cdb(struct cpu_user_regs *r);
 #define debugger_trap_entry(_v, _r) (0)
-#define debugger_trap_fatal(_v, _r) __trap_to_cdb(_r)
+
+static inline int debugger_trap_fatal(
+    unsigned int vector, struct cpu_user_regs *regs)
+{
+    (void)__trap_to_cdb(regs);
+    return (vector == TRAP_int3); /* int3 is harmless */
+}
+
 /* Int3 is a trivial way to gather cpu_user_regs context. */
 #define debugger_trap_immediate() __asm__ __volatile__ ( "int3" );